Make babl compile with stricter compiler warnings, mostly related to

	changing pointer arith from void* to char*.

	* babl/babl-classes.h:
	* babl/babl-component.c: (component_new):
	* babl/babl-conversion.c: (conversion_new),
	(babl_conversion_planar_process), (babl_conversion_process):
	* babl/babl-core.c: (convert_double_double), (rgba_to_rgba):
	* babl/babl-extension.c: (extension_new):
	* babl/babl-fish-path.c: (babl_fish_path):
	* babl/babl-fish-reference.c: (babl_fish_reference),
	(convert_to_double), (convert_from_double), (process_same_model),
	(babl_fish_reference_process):
	* babl/babl-fish-simple.c: (babl_fish_simple):
	* babl/babl-fish.c: (babl_fish_process):
	* babl/babl-format.c: (format_new):
	* babl/babl-image.c: (image_new), (babl_image_from_linear),
	(babl_image):
	* babl/babl-internal.h:
	* babl/babl-memory.c: (babl_malloc):
	* babl/babl-model.c: (model_new):
	* babl/babl-type.c: (type_new), (r_interval), (test_init):
	* babl/base/babl-base.c:
	* babl/base/babl-base.h:
	* babl/base/formats.c:
	* babl/base/model-gray.c: (rgba_to_graya), (rgba_to_gray),
	(rgb_to_gray_2_2), (gray_2_2_to_rgb), (graya_to_rgba),
	(gray_to_rgba), (gray_alpha_premultiplied_to_rgba),
	(rgba_to_gray_alpha_premultiplied),
	(non_premultiplied_to_premultiplied),
	(premultiplied_to_non_premultiplied),
	(rgba2gray_gamma_2_2_premultiplied),
	(gray_gamma_2_2_premultiplied2rgba):
	* babl/base/model-rgb.c: (copy_strip_1), (g3_gamma_2_2),
	(g3_inv_gamma_2_2), (non_premultiplied_to_premultiplied),
	(premultiplied_to_non_premultiplied),
	(rgba2rgba_gamma_2_2_premultiplied),
	(rgba_gamma_2_2_premultiplied2rgba), (rgba2rgba_gamma_2_2),
	(rgba_gamma_2_22rgba):
	* babl/base/model-ycbcr.c: (rgba_to_ycbcra), (rgba_to_ycbcr),
	(ycbcra_to_rgba), (ycbcr_to_rgba):
	* babl/base/type-float.c: (convert_double_float),
	(convert_float_double):
	* babl/base/type-u16.c: (convert_double_u16_scaled),
	(convert_u16_double_scaled):
	* babl/base/type-u32.c: (convert_double_u32_scaled),
	(convert_u32_double_scaled):
	* babl/base/type-u8.c: (convert_double_u8_scaled),
	(convert_u8_double_scaled):
	* extensions/CIE-Lab.c: (rgba_to_lab), (lab_to_rgba),
	(rgba_to_laba), (laba_to_rgba), (convert_double_u8_scaled),
	(convert_u8_double_scaled), (convert_double_u16_scaled),
	(convert_u16_double_scaled):
	* extensions/gegl-fixups.c: (conv_F_8), (conv_8_F):
	* extensions/gggl-lies.c: (conv_F_8), (conv_F_16), (conv_8_F),
	(conv_16_F):
	* extensions/gggl.c: (conv_F_8), (conv_F_16), (conv_8_F),
	(conv_16_F):
	* extensions/naive-CMYK.c: (rgba_to_cmyk), (cmyk_to_rgba):
	* tests/babl-html-dump.c: (normalize):
	* tests/babl_class_name.c:
	* tests/formats.c: (format_check):
	* tests/grayscale_to_rgb.c:
	* tests/models.c: (model_check):
	* tests/rgb_to_bgr.c:
	* tests/rgb_to_ycbcr.c:
	* tests/srgb_to_lab_u8.c:
	* tests/types.c: (type_check):

diff --git a/ChangeLog b/ChangeLog
index 305f633232808545485e6f645f5cb47bc1abd952..2bec328b42cb52065c38f0d62b05a7df222737d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,74 @@
+2006-11-17  Øyvind Kolås  <pippin@gimp.org>
+
+       Make babl compile with stricter compiler warnings, mostly related to
+       changing pointer arith from void* to char*.
+
+       * babl/babl-classes.h:
+       * babl/babl-component.c: (component_new):
+       * babl/babl-conversion.c: (conversion_new),
+       (babl_conversion_planar_process), (babl_conversion_process):
+       * babl/babl-core.c: (convert_double_double), (rgba_to_rgba):
+       * babl/babl-extension.c: (extension_new):
+       * babl/babl-fish-path.c: (babl_fish_path):
+       * babl/babl-fish-reference.c: (babl_fish_reference),
+       (convert_to_double), (convert_from_double), (process_same_model),
+       (babl_fish_reference_process):
+       * babl/babl-fish-simple.c: (babl_fish_simple):
+       * babl/babl-fish.c: (babl_fish_process):
+       * babl/babl-format.c: (format_new):
+       * babl/babl-image.c: (image_new), (babl_image_from_linear),
+       (babl_image):
+       * babl/babl-internal.h:
+       * babl/babl-memory.c: (babl_malloc):
+       * babl/babl-model.c: (model_new):
+       * babl/babl-type.c: (type_new), (r_interval), (test_init):
+       * babl/base/babl-base.c:
+       * babl/base/babl-base.h:
+       * babl/base/formats.c:
+       * babl/base/model-gray.c: (rgba_to_graya), (rgba_to_gray),
+       (rgb_to_gray_2_2), (gray_2_2_to_rgb), (graya_to_rgba),
+       (gray_to_rgba), (gray_alpha_premultiplied_to_rgba),
+       (rgba_to_gray_alpha_premultiplied),
+       (non_premultiplied_to_premultiplied),
+       (premultiplied_to_non_premultiplied),
+       (rgba2gray_gamma_2_2_premultiplied),
+       (gray_gamma_2_2_premultiplied2rgba):
+       * babl/base/model-rgb.c: (copy_strip_1), (g3_gamma_2_2),
+       (g3_inv_gamma_2_2), (non_premultiplied_to_premultiplied),
+       (premultiplied_to_non_premultiplied),
+       (rgba2rgba_gamma_2_2_premultiplied),
+       (rgba_gamma_2_2_premultiplied2rgba), (rgba2rgba_gamma_2_2),
+       (rgba_gamma_2_22rgba):
+       * babl/base/model-ycbcr.c: (rgba_to_ycbcra), (rgba_to_ycbcr),
+       (ycbcra_to_rgba), (ycbcr_to_rgba):
+       * babl/base/type-float.c: (convert_double_float),
+       (convert_float_double):
+       * babl/base/type-u16.c: (convert_double_u16_scaled),
+       (convert_u16_double_scaled):
+       * babl/base/type-u32.c: (convert_double_u32_scaled),
+       (convert_u32_double_scaled):
+       * babl/base/type-u8.c: (convert_double_u8_scaled),
+       (convert_u8_double_scaled):
+       * extensions/CIE-Lab.c: (rgba_to_lab), (lab_to_rgba),
+       (rgba_to_laba), (laba_to_rgba), (convert_double_u8_scaled),
+       (convert_u8_double_scaled), (convert_double_u16_scaled),
+       (convert_u16_double_scaled):
+       * extensions/gegl-fixups.c: (conv_F_8), (conv_8_F):
+       * extensions/gggl-lies.c: (conv_F_8), (conv_F_16), (conv_8_F),
+       (conv_16_F):
+       * extensions/gggl.c: (conv_F_8), (conv_F_16), (conv_8_F),
+       (conv_16_F):
+       * extensions/naive-CMYK.c: (rgba_to_cmyk), (cmyk_to_rgba):
+       * tests/babl-html-dump.c: (normalize):
+       * tests/babl_class_name.c:
+       * tests/formats.c: (format_check):
+       * tests/grayscale_to_rgb.c:
+       * tests/models.c: (model_check):
+       * tests/rgb_to_bgr.c:
+       * tests/rgb_to_ycbcr.c:
+       * tests/srgb_to_lab_u8.c:
+       * tests/types.c: (type_check):
+
 2006-11-15  Øyvind Kolås  <pippin@gimp.org>
 
        Set the default BABL_PATH based on the prefix babl is compiled for.

diff --git a/babl/babl-classes.h b/babl/babl-classes.h
index 05106f32391cb5908cdd11b0b80a8177213d0b61..6eed82ef8f19a6e651882ba6940e34713fcbb459 100644 (file)
--- a/babl/babl-classes.h
+++ b/babl/babl-classes.h
@@ -21,25 +21,25 @@
 #define _BABL_CLASSES_H
 
 /* Type and Format */
-typedef long (*BablFuncLinear)    (void  *src,
-                                   void  *dst,
+typedef long (*BablFuncLinear)    (char  *src,
+                                   char  *dst,
                                    long   n);
 
 /* Signature of functions registered for reference type
  * conversions,
  */
-typedef long (*BablFuncPlane)     (void  *src,
-                                   void  *dst,
+typedef long (*BablFuncPlane)     (char  *src,
+                                   char  *dst,
                                    int    src_pitch,
                                    int    dst_pitch,
                                    long   n);
 
 /* TypePlanar,ModelPlanar and FormatPlanar */
 typedef long (*BablFuncPlanar)    (int    src_bands,
-                                   void  *src[],
+                                   char  *src[],
                                    int    src_pitch[],
                                    int    dst_bands,
-                                   void  *dst[],
+                                   char  *dst[],
                                    int    dst_pitch[],
                                    long   n);
 
@@ -185,7 +185,7 @@ typedef struct
   BablComponent **component;
   BablSampling  **sampling;
   BablType      **type;
-  void          **data;
+  char          **data;
   int            *pitch;
   int            *stride;
 } BablImage;

diff --git a/babl/babl-component.c b/babl/babl-component.c
index 37ebb7be937e800314a2c167cedd31ad58310762..8e87589663df7896aa4e334cebb955edea88bb95 100644 (file)
--- a/babl/babl-component.c
+++ b/babl/babl-component.c
@@ -42,7 +42,7 @@ component_new (const char *name,
   Babl *babl;
 
   babl                   = babl_malloc (sizeof (BablComponent) + strlen (name) + 1);
-  babl->instance.name    = (void *) babl + sizeof (BablComponent);
+  babl->instance.name    = (char *) babl + sizeof (BablComponent);
   strcpy (babl->instance.name, name);
 
   babl->class_type       = BABL_COMPONENT;

diff --git a/babl/babl-conversion.c b/babl/babl-conversion.c
index e5dd826b53dffc8133989712c0489a663eec2701..7d472aa8c67d36e8155538b8927d28e638d583fa 100644 (file)
--- a/babl/babl-conversion.c
+++ b/babl/babl-conversion.c
@@ -46,7 +46,7 @@ conversion_new (const char        *name,
                destination->class_type);
 
   babl = babl_malloc (sizeof (BablConversion) + strlen (name) + 1);
-  babl->instance.name = (void *)babl + sizeof (BablConversion);
+  babl->instance.name = (char *)babl + sizeof (BablConversion);
   strcpy(babl->instance.name, name);
 
   if (linear)
@@ -299,11 +299,11 @@ babl_conversion_planar_process (BablConversion *conversion,
                                 long            n)
 {
 #ifdef USE_ALLOCA
-  void **src_data = alloca (sizeof (void*) * source->components);
-  void **dst_data = alloca (sizeof (void*) * destination->components);
+  char **src_data = alloca (sizeof (void*) * source->components);
+  char **dst_data = alloca (sizeof (void*) * destination->components);
 #else
-  void *src_data[BABL_MAX_COMPONENTS];
-  void *dst_data[BABL_MAX_COMPONENTS];
+  char *src_data[BABL_MAX_COMPONENTS];
+  char *dst_data[BABL_MAX_COMPONENTS];
 #endif
 
   memcpy (src_data, source->data, sizeof (void*) * source->components);
@@ -320,8 +320,8 @@ babl_conversion_planar_process (BablConversion *conversion,
 
 long
 babl_conversion_process (Babl *babl,
-                         void *source,
-                         void *destination,
+                         char *source,
+                         char *destination,
                          long  n)
 {
   BablConversion *conversion = (BablConversion*) babl;

diff --git a/babl/babl-core.c b/babl/babl-core.c
index 0b80f3020a3204b0044dc557ff3189a08183b17c..05e457633d6f752f6d4a26dca9c46a0e28b03327 100644 (file)
--- a/babl/babl-core.c
+++ b/babl/babl-core.c
@@ -17,13 +17,13 @@
  */
 
 #include <string.h>
-#include "babl.h"
+#include "babl-internal.h"
 #include "babl-ids.h"
 #include "util.h"
 
 static long
-convert_double_double (void *src,
-                       void *dst,
+convert_double_double (char *src,
+                       char *dst,
                        int   src_pitch,
                        int   dst_pitch,
                        long  n)
@@ -47,10 +47,10 @@ convert_double_double (void *src,
 /*
 static long
 copy_strip_1 (int    src_bands,
-              void **src,
+              char **src,
               int   *src_pitch,
               int    dst_bands,
-              void **dst,
+              char **dst,
               int   *dst_pitch,
               long   n)
 {
@@ -77,8 +77,8 @@ copy_strip_1 (int    src_bands,
 
 */
 static long
-rgba_to_rgba (void *src,
-              void *dst,
+rgba_to_rgba (char *src,
+              char *dst,
               long  n)
 {
   memcpy (dst, src, n * sizeof (double) * 4);

diff --git a/babl/babl-extension.c b/babl/babl-extension.c
index 812e4050ca4a580d03d87a22d201d7a176b23594..49c9f161cddc6d7d7ed45733e8d54dba84beb194 100644 (file)
--- a/babl/babl-extension.c
+++ b/babl/babl-extension.c
@@ -70,7 +70,7 @@ extension_new (const char *path,
   Babl *babl;
 
   babl                       = babl_malloc (sizeof (BablExtension) + strlen (path) + 1);
-  babl->instance.name        = (void *) babl + sizeof (BablExtension);
+  babl->instance.name        = (char *) babl + sizeof (BablExtension);
   strcpy (babl->instance.name, path);
   babl->instance.id          = 0;
   babl->class_type           = BABL_EXTENSION;
@@ -162,7 +162,7 @@ load_failed (Babl *babl)
   return NULL;
 }
 
-Babl *
+static Babl *
 babl_extension_load (const char *path)
 {
   Babl *babl             = NULL;

diff --git a/babl/babl-fish-path.c b/babl/babl-fish-path.c
index 3b407cab80145ed523dee8d4dde2eb7dd2f30103..8e1d9fa796c140b5d465ff22b0fdca1572c0a48c 100644 (file)
--- a/babl/babl-fish-path.c
+++ b/babl/babl-fish-path.c
@@ -285,7 +285,7 @@ babl_fish_path (Babl   *source,
                                         strlen (name) + 1);
   babl->class_type       = BABL_FISH_PATH;
   babl->instance.id      = 0;
-  babl->instance.name    = ((void *)babl) + sizeof(BablFishPath);
+  babl->instance.name    = ((char*)babl) + sizeof(BablFishPath);
   strcpy (babl->instance.name, name);
   babl->fish.source      = source;
   babl->fish.destination = destination;

diff --git a/babl/babl-fish-reference.c b/babl/babl-fish-reference.c
index a93dd8563809eb90b80a1f80bf56cfd3c01add70..9b62226b160d50616b5b3fe5a4f322afcc9afa15 100644 (file)
--- a/babl/babl-fish-reference.c
+++ b/babl/babl-fish-reference.c
@@ -62,7 +62,7 @@ babl_fish_reference (Babl   *source,
                                         strlen (name) + 1);
   babl->class_type       = BABL_FISH_REFERENCE;
   babl->instance.id      = 0;
-  babl->instance.name    = ((void *)babl) + sizeof(BablFishReference);
+  babl->instance.name    = ((char *)babl) + sizeof(BablFishReference);
   strcpy (babl->instance.name, name);
   babl->fish.source      = source;
   babl->fish.destination = destination;
@@ -84,15 +84,15 @@ babl_fish_reference (Babl   *source,
 static void
 convert_to_double (BablFormat *source_fmt,
                    BablImage  *source,
-                   void       *source_buf,
-                   void       *source_double_buf,
+                   char       *source_buf,
+                   char       *source_double_buf,
                    int         n)
 {
   int i;
 
   BablImage *src_img;
   BablImage *dst_img;
-
+  
   src_img = (BablImage*) babl_image (
       babl_component_id (BABL_LUMINANCE), NULL, 1, 0, NULL);
   dst_img = (BablImage*) babl_image (
@@ -140,9 +140,9 @@ convert_to_double (BablFormat *source_fmt,
 
 static void
 convert_from_double (BablFormat *destination_fmt,
-                     void       *destination_double_buf,
+                     char       *destination_double_buf,
                      BablImage  *destination,
-                     void       *destination_buf,
+                     char       *destination_buf,
                      int         n)
 {
   int i;
@@ -213,7 +213,7 @@ process_same_model (Babl      *babl,
   convert_to_double (
      (BablFormat*) BABL(babl->fish.source),
      BABL_IS_BABL(source)?source:NULL,
-     BABL_IS_BABL(source)?NULL:source,
+     BABL_IS_BABL(source)?NULL:(char*)source,
      double_buf,
      n
    );
@@ -222,7 +222,7 @@ process_same_model (Babl      *babl,
      (BablFormat*) BABL(babl->fish.destination),
      double_buf,
      BABL_IS_BABL(destination)?destination:NULL,
-     BABL_IS_BABL(destination)?NULL:destination,
+     BABL_IS_BABL(destination)?NULL:(char*)destination,
      n
    );
 
@@ -271,7 +271,7 @@ babl_fish_reference_process (Babl      *babl,
   convert_to_double (
      (BablFormat*) BABL(babl->fish.source),
      NULL,
-     source,
+     (char*)source,
      source_double_buf,
      n
    );
@@ -325,7 +325,7 @@ babl_fish_reference_process (Babl      *babl,
      (BablFormat*) BABL(babl->fish.destination),
      destination_double_buf,
      NULL,
-     destination,
+     (char*)destination,
      n
    );
 

diff --git a/babl/babl-fish-simple.c b/babl/babl-fish-simple.c
index deb525fc52bf250827490b7ce8a065b87d2d1ea5..26249f7feed8ae3179f8d9312741f2ff7c144c93 100644 (file)
--- a/babl/babl-fish-simple.c
+++ b/babl/babl-fish-simple.c
@@ -39,7 +39,7 @@ babl_fish_simple (BablConversion *conversion)
                                         strlen (name) + 1);
   babl->class_type       = BABL_FISH_SIMPLE;
   babl->instance.id      = 0;
-  babl->instance.name    = ((void *)babl) + sizeof(BablFishSimple);
+  babl->instance.name    = ((char *)babl) + sizeof(BablFishSimple);
   strcpy (babl->instance.name, name);
   babl->fish.source      = conversion->source;
   babl->fish.destination = conversion->destination;

diff --git a/babl/babl-fish.c b/babl/babl-fish.c
index 8ced85749dd18de395a9e6d699a68f7e53836ecc..cb5a3021d405d02d4dd545c3f7833b5d4ba1d6c5 100644 (file)
--- a/babl/babl-fish.c
+++ b/babl/babl-fish.c
@@ -177,7 +177,7 @@ babl_fish_process (Babl *babl,
              else
                {
                  ret = babl_conversion_process (BABL(babl->fish_simple.conversion),
-                                              source_image, destination_image, n);
+                                              (char*)source_image, (char*)destination_image, n);
                }
            }
 

diff --git a/babl/babl-format.c b/babl/babl-format.c
index e41aca7c1ab55f6fecc787543b145b9b0e271220..149e61a9cbe0ecfb5278fcc6976de3379dfd94c7 100644 (file)
--- a/babl/babl-format.c
+++ b/babl/babl-format.c
@@ -75,10 +75,10 @@ format_new (const char     *name,
                        sizeof (int)            * (components));
 
   babl->format.from      = NULL;
-  babl->format.component = ((void *)babl) + sizeof (BablFormat);
-  babl->format.type      = ((void *)babl->format.component) + sizeof (BablComponent*) * (components);
-  babl->format.sampling  = ((void *)babl->format.type)      + sizeof (BablType*) * (components);
-  babl->instance.name    = ((void *)babl->format.sampling)  + sizeof (BablSampling*) * (components);
+  babl->format.component = (void*)(((char *)babl) + sizeof (BablFormat));
+  babl->format.type      = (void*)(((char *)babl->format.component) + sizeof (BablComponent*) * (components));
+  babl->format.sampling  = (void*)(((char *)babl->format.type)      + sizeof (BablType*) * (components));
+  babl->instance.name    = ((char *)babl->format.sampling)  + sizeof (BablSampling*) * (components);
   
   babl->class_type    = BABL_FORMAT;
   babl->instance.id   = id;

diff --git a/babl/babl-image.c b/babl/babl-image.c
index a8ecc6ecf8b9c1a3533189c6b0865368488bfb42..0b202ba45098833a1b41cd6dea1cd858b49d8453 100644 (file)
--- a/babl/babl-image.c
+++ b/babl/babl-image.c
@@ -29,7 +29,7 @@ image_new (BablFormat     *format,
            BablComponent **component,
            BablSampling  **sampling,
            BablType      **type,
-           void          **data,
+           char          **data,
            int            *pitch,
            int            *stride)
 {
@@ -43,12 +43,12 @@ image_new (BablFormat     *format,
                        sizeof (void*)          * (components) +
                        sizeof (int)            * (components) +
                        sizeof (int)            * (components));
-  babl->image.component     = ((void *)babl)                  + sizeof (BablImage);
-  babl->image.sampling      = ((void *)babl->image.component) + sizeof (BablComponent*) * (components);
-  babl->image.type          = ((void *)babl->image.sampling)  + sizeof (BablSampling*)  * (components);
-  babl->image.data          = ((void *)babl->image.type)      + sizeof (BablType*)      * (components);
-  babl->image.pitch         = ((void *)babl->image.data)      + sizeof (void*)          * (components);
-  babl->image.stride        = ((void *)babl->image.pitch)     + sizeof (int)            * (components);
+  babl->image.component = (void*)(((char *)babl)                  + sizeof (BablImage));
+  babl->image.sampling  = (void*)(((char *)babl->image.component) + sizeof (BablComponent*) * (components));
+  babl->image.type      = (void*)(((char *)babl->image.sampling)  + sizeof (BablSampling*)  * (components));
+  babl->image.data      = (void*)(((char *)babl->image.type)      + sizeof (BablType*)      * (components));
+  babl->image.pitch     = (void*)(((char *)babl->image.data)      + sizeof (void*)          * (components));
+  babl->image.stride    = (void*)(((char *)babl->image.pitch)     + sizeof (int)            * (components));
 
   babl->class_type       = BABL_IMAGE;
   babl->instance.id      = 0;
@@ -67,7 +67,7 @@ image_new (BablFormat     *format,
 }
 
 Babl *
-babl_image_from_linear (void  *buffer,
+babl_image_from_linear (char  *buffer,
                         Babl  *format)
 {
   Babl          *babl;
@@ -77,7 +77,7 @@ babl_image_from_linear (void  *buffer,
   BablComponent *component [BABL_MAX_COMPONENTS];
   BablSampling  *sampling  [BABL_MAX_COMPONENTS];
   BablType      *type      [BABL_MAX_COMPONENTS];
-  void          *data      [BABL_MAX_COMPONENTS];
+  char          *data      [BABL_MAX_COMPONENTS];
   int            pitch     [BABL_MAX_COMPONENTS];
   int            stride    [BABL_MAX_COMPONENTS];
 
@@ -152,7 +152,7 @@ babl_image (void *first,
   BablComponent *component [BABL_MAX_COMPONENTS];
   BablSampling  *sampling  [BABL_MAX_COMPONENTS];
   BablType      *type      [BABL_MAX_COMPONENTS];
-  void          *data      [BABL_MAX_COMPONENTS];
+  char          *data      [BABL_MAX_COMPONENTS];
   int            pitch     [BABL_MAX_COMPONENTS];
   int            stride    [BABL_MAX_COMPONENTS];
 

diff --git a/babl/babl-internal.h b/babl/babl-internal.h
index 376cb6f8074edfb7c9c99d087c7087921149658c..06d69c27ca69d9b907f606ac74214a577a0fb3ee 100644 (file)
--- a/babl/babl-internal.h
+++ b/babl/babl-internal.h
@@ -50,8 +50,8 @@ Babl   * babl_conversion_find           (void           *source,
 double   babl_conversion_error          (BablConversion *conversion);
 long     babl_conversion_cost           (BablConversion *conversion);
 long     babl_conversion_process        (Babl           *conversion,
-                                         void           *source,
-                                         void           *destination,
+                                         char           *source,
+                                         char           *destination,
                                          long            n);
 
 Babl   * babl_extension_base            (void);
@@ -84,7 +84,7 @@ long     babl_fish_path_process         (Babl           *babl,
                                          long            n);
 
 double   babl_format_loss               (Babl           *babl);
-Babl   * babl_image_from_linear         (void           *buffer,
+Babl   * babl_image_from_linear         (char           *buffer,
                                          Babl           *format);
 Babl   * babl_image_double_from_image   (Babl           *source);
 

diff --git a/babl/babl-memory.c b/babl/babl-memory.c
index ec09ff24286609c9841c4e6615588134add02c51..0e71ff499f946b374d9fd5df714c03bb085671bd 100644 (file)
--- a/babl/babl-memory.c
+++ b/babl/babl-memory.c
@@ -50,7 +50,7 @@ typedef struct
 
 #define OFFSET   (sizeof(BablAllocInfo))
 
-#define BAI(ptr)    ((BablAllocInfo*)(((void*)ptr)-OFFSET))
+#define BAI(ptr)    ((BablAllocInfo*)(((char*)ptr)-OFFSET))
 #define IS_BAI(ptr) (BAI(ptr)->signature == signature)
 
 /* runtime statistics: */
@@ -95,7 +95,7 @@ functions_sanity (void)
 void *
 babl_malloc (size_t size)
 {
-  void *ret;
+  char *ret;
 
   babl_assert (size);
 
@@ -107,7 +107,7 @@ babl_malloc (size_t size)
   BAI(ret + OFFSET)->signature = signature;
   BAI(ret + OFFSET)->size      = size;
   mallocs++;
-  return ret + OFFSET;
+  return (void*)(ret + OFFSET);
 }
 
 /* Create a duplicate allocation of the same size, note

diff --git a/babl/babl-model.c b/babl/babl-model.c
index c1f1bdb8d6a56318d84096886ac6d3a128b2c5cf..573e2f301d4cb481be497ebe87383b92e7d82eb4 100644 (file)
--- a/babl/babl-model.c
+++ b/babl/babl-model.c
@@ -63,8 +63,8 @@ model_new (const char     *name,
   babl                   = babl_malloc (sizeof (BablModel) +
                                         sizeof (BablComponent*) * (components) +
                                         strlen (name) + 1);
-  babl->model.component = ((void*)babl) + sizeof (BablModel);
-  babl->instance.name   = ((void*)babl->model.component) + sizeof (BablComponent*) * (components);
+  babl->model.component = (void*)(((char*)babl) + sizeof (BablModel));
+  babl->instance.name   = (void*)(((char*)babl->model.component) + sizeof (BablComponent*) * (components));
   
   babl->class_type       = BABL_MODEL;
   babl->instance.id      = id;

diff --git a/babl/babl-type.c b/babl/babl-type.c
index e04e97dfa065f49705df8fd377c42d1f2282faa7..5a81296f86228fdff5d61f8859130abd4075fb32 100644 (file)
--- a/babl/babl-type.c
+++ b/babl/babl-type.c
@@ -46,7 +46,7 @@ type_new (const char  *name,
   babl_assert (bits % 8 == 0);
   
   babl                = babl_malloc (sizeof (BablType) + strlen (name) + 1);
-  babl->instance.name = (void*) babl + sizeof (BablType);
+  babl->instance.name = (void*)((char*) babl + sizeof (BablType));
   babl->class_type    = BABL_TYPE;
   babl->instance.id   = id;
   strcpy (babl->instance.name, name);
@@ -145,7 +145,7 @@ babl_type_new (void *first_arg,
 
 double test[samples];
 
-double r_interval (double min, double max)
+static double r_interval (double min, double max)
 {
   long int rand_i = random ();
   double ret;
@@ -155,7 +155,7 @@ double r_interval (double min, double max)
   return ret;
 }
 
-void test_init (double min, double max)
+static void test_init (double min, double max)
 {
   int i;
   srandom (20050728);

diff --git a/babl/base/babl-base.c b/babl/base/babl-base.c
index 20d8cc2b2077a0f1170df2a388614fe8069aec7f..f33909111213f0d4e0e3f8d269b380141f7f58ff 100644 (file)
--- a/babl/base/babl-base.c
+++ b/babl/base/babl-base.c
@@ -17,9 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "babl-base.h"
+
 extern int babl_hmpf_on_name_lookups;
 
-void babl_formats_init (void);
 static void types  (void);
 static void models (void);
 
@@ -45,10 +46,6 @@ babl_base_destroy (void)
  * types
  */
 
-void babl_base_type_float  (void);
-void babl_base_type_u8     (void);
-void babl_base_type_u16    (void);
-void babl_base_type_u32    (void);
 
 static void
 types (void)
@@ -63,9 +60,6 @@ types (void)
  * models
  */
 
-void babl_base_model_rgb   (void);
-void babl_base_model_gray  (void);
-void babl_base_model_ycbcr (void);
 
 static void
 models (void)

diff --git a/babl/base/babl-base.h b/babl/base/babl-base.h
index 1c01346d3ca949f9ffdfad0a38595269cf728114..7ddb4efbdd6fb0bba9730e6c80b44aab1e67e874 100644 (file)
--- a/babl/base/babl-base.h
+++ b/babl/base/babl-base.h
@@ -20,7 +20,17 @@
 #ifndef _BABL_BASE_H
 #define _BABL_BASE_H
 
-void babl_base_init ();
-void babl_base_destroy ();
+void babl_base_init (void);
+void babl_base_destroy (void);
+void babl_formats_init (void);
+
+void babl_base_type_float  (void);
+void babl_base_type_u8     (void);
+void babl_base_type_u16    (void);
+void babl_base_type_u32    (void);
+
+void babl_base_model_rgb   (void);
+void babl_base_model_gray  (void);
+void babl_base_model_ycbcr (void);
 
 #endif

diff --git a/babl/base/formats.c b/babl/base/formats.c
index 6573398dc2b7732562b174cf22215cdf337bd318..52c09ff6ea0c6db329ddda7e3043a42c34072864 100644 (file)
--- a/babl/base/formats.c
+++ b/babl/base/formats.c
@@ -19,6 +19,7 @@
 
 #include "babl.h"
 #include "babl-ids.h"
+#include "babl-base.h"
 
 void
 babl_formats_init (void)

diff --git a/babl/base/model-gray.c b/babl/base/model-gray.c
index e96a0290d8756cd3b59dded464323cd1078a6f53..2f9148a1018e1c856ab23d499d3e38769331e788 100644 (file)
--- a/babl/base/model-gray.c
+++ b/babl/base/model-gray.c
@@ -24,6 +24,7 @@
 #include "util.h"
 #include "rgb-constants.h"
 #include "math.h"
+#include "babl-base.h"
 
 static void components  (void);
 static void models      (void);
@@ -106,9 +107,9 @@ models (void)
 
 
 static long
-rgba_to_graya (void *src,
-               void *dst,
-               long   n)
+rgba_to_graya (char *src,
+               char *dst,
+               long  n)
 {
   while (n--)
     {
@@ -134,9 +135,9 @@ rgba_to_graya (void *src,
 }
 
 static long
-rgba_to_gray (void *src,
-              void *dst,
-              long   n)
+rgba_to_gray (char *src,
+              char *dst,
+              long  n)
 {
   while (n--)
     {
@@ -163,10 +164,10 @@ rgba_to_gray (void *src,
 
 static long
 rgb_to_gray_2_2 (int    src_bands,
-                 void **src,
+                 char **src,
                  int   *src_pitch,
                  int    dst_bands,
-                 void **dst,
+                 char **dst,
                  int   *dst_pitch,
                  long   n)
 {
@@ -200,10 +201,10 @@ rgb_to_gray_2_2 (int    src_bands,
 
 static long
 gray_2_2_to_rgb (int    src_bands,
-                 void **src,
+                 char **src,
                  int   *src_pitch,
                  int    dst_bands,
-                 void **dst,
+                 char **dst,
                  int   *dst_pitch,
                  long   n)
 {
@@ -238,8 +239,8 @@ gray_2_2_to_rgb (int    src_bands,
 
 
 static long
-graya_to_rgba (void *src,
-               void *dst,
+graya_to_rgba (char *src,
+               char *dst,
                long  n)
 {
   while (n--)
@@ -267,8 +268,8 @@ graya_to_rgba (void *src,
 
 
 static long
-gray_to_rgba (void *src,
-              void *dst,
+gray_to_rgba (char *src,
+              char *dst,
               long  n)
 {
   while (n--)
@@ -294,10 +295,10 @@ gray_to_rgba (void *src,
 
 static long
 gray_alpha_premultiplied_to_rgba (int    src_bands,
-                                  void **src,
+                                  char **src,
                                   int   *src_pitch,
                                   int    dst_bands,
-                                  void **dst,
+                                  char **dst,
                                   int   *dst_pitch,
                                   long   n)
 {
@@ -331,10 +332,10 @@ gray_alpha_premultiplied_to_rgba (int    src_bands,
 
 static long
 rgba_to_gray_alpha_premultiplied (int    src_bands,
-                                  void **src,
+                                  char **src,
                                   int   *src_pitch,
                                   int    dst_bands,
-                                  void **dst,
+                                  char **dst,
                                   int   *dst_pitch,
                                   long   n)
 {
@@ -365,10 +366,10 @@ rgba_to_gray_alpha_premultiplied (int    src_bands,
 
 static long
 non_premultiplied_to_premultiplied (int    src_bands,
-                                    void **src,
+                                    char **src,
                                     int   *src_pitch,
                                     int    dst_bands,
-                                    void **dst,
+                                    char **dst,
                                     int   *dst_pitch,
                                     long   n)
 {
@@ -393,10 +394,10 @@ non_premultiplied_to_premultiplied (int    src_bands,
 
 static long
 premultiplied_to_non_premultiplied (int    src_bands,
-                                    void **src,
+                                    char **src,
                                     int   *src_pitch,
                                     int    dst_bands,
-                                    void **dst,
+                                    char **dst,
                                     int   *dst_pitch,
                                     long   n)
 {
@@ -427,8 +428,8 @@ premultiplied_to_non_premultiplied (int    src_bands,
 }
 
 static long
-rgba2gray_gamma_2_2_premultiplied (void *src,
-                                   void *dst,
+rgba2gray_gamma_2_2_premultiplied (char *src,
+                                   char *dst,
                                    long  n)
 {
   while (n--)
@@ -457,8 +458,8 @@ rgba2gray_gamma_2_2_premultiplied (void *src,
 
 
 static long
-gray_gamma_2_2_premultiplied2rgba (void *src,
-                                   void *dst,
+gray_gamma_2_2_premultiplied2rgba (char *src,
+                                   char *dst,
                                    long   n)
 {
   while (n--)

diff --git a/babl/base/model-rgb.c b/babl/base/model-rgb.c
index 0cb7e3f7136203bdd9bc53807fb0d2e39c22ee1e..1b6e7d58594173d32a612c2dc16cb66b651451fb 100644 (file)
--- a/babl/base/model-rgb.c
+++ b/babl/base/model-rgb.c
@@ -21,6 +21,7 @@
 #include "babl.h"
 #include "babl-ids.h"
 #include "util.h"
+#include "babl-base.h"
 
 static void models        (void);
 static void components    (void);
@@ -152,10 +153,10 @@ models (void)
 
 static long
 copy_strip_1 (int    src_bands,
-              void **src,
+              char **src,
               int   *src_pitch,
               int    dst_bands,
-              void **dst,
+              char **dst,
               int   *dst_pitch,
               long   samples)
 {
@@ -182,10 +183,10 @@ copy_strip_1 (int    src_bands,
 
 static long
 g3_gamma_2_2 (int    src_bands,
-              void **src,
+              char **src,
               int   *src_pitch,
               int    dst_bands,
-              void **dst,
+              char **dst,
               int   *dst_pitch,
               long   samples)
 {
@@ -207,10 +208,10 @@ g3_gamma_2_2 (int    src_bands,
 
 static long
 g3_inv_gamma_2_2 (int    src_bands,
-                  void **src,
+                  char **src,
                   int   *src_pitch,
                   int    dst_bands,
-                  void **dst,
+                  char **dst,
                   int   *dst_pitch,
                   long   samples)
 {
@@ -237,10 +238,10 @@ g3_inv_gamma_2_2 (int    src_bands,
 
 static long
 non_premultiplied_to_premultiplied (int    src_bands,
-                                    void **src,
+                                    char **src,
                                     int   *src_pitch,
                                     int    dst_bands,
-                                    void **dst,
+                                    char **dst,
                                     int   *dst_pitch,
                                     long   samples)
 {
@@ -265,10 +266,10 @@ non_premultiplied_to_premultiplied (int    src_bands,
 
 static long
 premultiplied_to_non_premultiplied (int    src_bands,
-                                    void **src,
+                                    char **src,
                                     int   *src_pitch,
                                     int    dst_bands,
-                                    void **dst,
+                                    char **dst,
                                     int   *dst_pitch,
                                     long   samples)
 {
@@ -301,8 +302,8 @@ premultiplied_to_non_premultiplied (int    src_bands,
 
 
 static long
-rgba2rgba_gamma_2_2_premultiplied (void *src,
-                                   void *dst,
+rgba2rgba_gamma_2_2_premultiplied (char *src,
+                                   char *dst,
                                    long  samples)
 {
   long n=samples; 
@@ -321,8 +322,8 @@ rgba2rgba_gamma_2_2_premultiplied (void *src,
 
 
 static long
-rgba_gamma_2_2_premultiplied2rgba (void *src,
-                                   void *dst,
+rgba_gamma_2_2_premultiplied2rgba (char *src,
+                                   char *dst,
                                    long   samples)
 {
   long n=samples; 
@@ -342,8 +343,8 @@ rgba_gamma_2_2_premultiplied2rgba (void *src,
 
 
 static long
-rgba2rgba_gamma_2_2 (void *src,
-                     void *dst,
+rgba2rgba_gamma_2_2 (char *src,
+                     char *dst,
                      long  samples)
 {
   long n=samples; 
@@ -362,9 +363,9 @@ rgba2rgba_gamma_2_2 (void *src,
 
 
 static long
-rgba_gamma_2_22rgba (void *src,
-                     void *dst,
-                     long   samples)
+rgba_gamma_2_22rgba (char *src,
+                     char *dst,
+                     long  samples)
 {
   long n=samples;
   

diff --git a/babl/base/model-ycbcr.c b/babl/base/model-ycbcr.c
index b27c5d34955b2539100831355698eaf948ece590..8aec9c82aca39eb26bd64eb7a3aa5f7f91f86686 100644 (file)
--- a/babl/base/model-ycbcr.c
+++ b/babl/base/model-ycbcr.c
@@ -22,6 +22,7 @@
 #include <assert.h>
 #include "babl.h"
 #include "babl-ids.h"
+#include "babl-base.h"
 
 #include "util.h"
 
@@ -75,8 +76,8 @@ models (void)
 }
 
 static long
-rgba_to_ycbcra (void *src,
-                void *dst,
+rgba_to_ycbcra (char *src,
+                char *dst,
                 long  n)
 {
   while (n--)
@@ -109,8 +110,8 @@ rgba_to_ycbcra (void *src,
 
 
 static long
-rgba_to_ycbcr (void *src,
-               void *dst,
+rgba_to_ycbcr (char *src,
+               char *dst,
                long  n)
 {
   while (n--)
@@ -140,8 +141,8 @@ rgba_to_ycbcr (void *src,
 }
 
 static long
-ycbcra_to_rgba (void *src,
-                void *dst,
+ycbcra_to_rgba (char *src,
+                char *dst,
                 long  n)
 {
   while (n--)
@@ -174,8 +175,8 @@ ycbcra_to_rgba (void *src,
 
 
 static long
-ycbcr_to_rgba (void *src,
-               void *dst,
+ycbcr_to_rgba (char *src,
+               char *dst,
                long  n)
 {
   while (n--)

diff --git a/babl/base/type-float.c b/babl/base/type-float.c
index 7881b8f2a2fdacf16116e1c11dff4a8c7eb5ef05..a0b9d010f7598b566bd1a007fd1ae0d2d3fae9df 100644 (file)
--- a/babl/base/type-float.c
+++ b/babl/base/type-float.c
@@ -22,10 +22,11 @@
 
 #include "babl.h"
 #include "babl-ids.h"
+#include "babl-base.h"
 
 static long
-convert_double_float (void *src,
-                      void *dst,
+convert_double_float (char *src,
+                      char *dst,
                       int   src_pitch,
                       int   dst_pitch,
                       long  n)
@@ -40,8 +41,8 @@ convert_double_float (void *src,
 }
 
 static long
-convert_float_double (void *src,
-                      void *dst,
+convert_float_double (char *src,
+                      char *dst,
                       int   src_pitch,
                       int   dst_pitch,
                       long  n)

diff --git a/babl/base/type-u16.c b/babl/base/type-u16.c
index 784e2237b848812158cd93caf5c5e19b821c1440..b0ac0a8a5131b86cde47d9ee298afd7129b766f5 100644 (file)
--- a/babl/base/type-u16.c
+++ b/babl/base/type-u16.c
@@ -24,6 +24,7 @@
 
 #include "babl.h"
 #include "babl-ids.h"
+#include "babl-base.h"
 
 
 static inline long
@@ -31,8 +32,8 @@ convert_double_u16_scaled (double    min_val,
                            double    max_val,
                            uint16_t  min,
                            uint16_t  max,
-                           void     *src,
-                           void     *dst,
+                           char     *src,
+                           char     *dst,
                            int       src_pitch,
                            int       dst_pitch,
                            long      n)
@@ -61,8 +62,8 @@ convert_u16_double_scaled (double    min_val,
                            double    max_val,
                            uint16_t  min,
                            uint16_t  max,
-                           void     *src,
-                           void     *dst,
+                           char     *src,
+                           char     *dst,
                            int       src_pitch,
                            int       dst_pitch,
                            long      n)

diff --git a/babl/base/type-u32.c b/babl/base/type-u32.c
index 990487cc32610691ce8844b2624aa9bee504a30a..683c684dc184d8200fbeef5f05fe7b39059a9444 100644 (file)
--- a/babl/base/type-u32.c
+++ b/babl/base/type-u32.c
@@ -24,14 +24,15 @@
 
 #include "babl.h"
 #include "babl-ids.h"
+#include "babl-base.h"
 
 static inline long
 convert_double_u32_scaled (double    min_val,
                            double    max_val,
                            uint32_t  min,
                            uint32_t  max,
-                           void     *src,
-                           void     *dst,
+                           char     *src,
+                           char     *dst,
                            int       src_pitch,
                            int       dst_pitch,
                            long      n)
@@ -60,8 +61,8 @@ convert_u32_double_scaled (double    min_val,
                            double    max_val,
                            uint32_t  min,
                            uint32_t  max,
-                           void     *src,
-                           void     *dst,
+                           char     *src,
+                           char     *dst,
                            int       src_pitch,
                            int       dst_pitch,
                            long      n)

diff --git a/babl/base/type-u8.c b/babl/base/type-u8.c
index 1f8b956d0ab1400f56e04bfdf8338aab9d8a4892..1f3ee802cc058506c7353702df080e260ec55d7d 100644 (file)
--- a/babl/base/type-u8.c
+++ b/babl/base/type-u8.c
@@ -23,6 +23,7 @@
 
 #include "babl.h"
 #include "babl-ids.h"
+#include "babl-base.h"
 
 #include <math.h>
 static inline long
@@ -30,8 +31,8 @@ convert_double_u8_scaled (double        min_val,
                           double        max_val,
                           unsigned char min,
                           unsigned char max,
-                          void         *src,
-                          void         *dst,
+                          char         *src,
+                          char         *dst,
                           int           src_pitch,
                           int           dst_pitch,
                           long          n)
@@ -60,8 +61,8 @@ convert_u8_double_scaled (double        min_val,
                           double        max_val,
                           unsigned char min,
                           unsigned char max,
-                          void         *src,
-                          void         *dst,
+                          char         *src,
+                          char         *dst,
                           int           src_pitch,
                           int           dst_pitch,
                           long          n)

diff --git a/extensions/CIE-Lab.c b/extensions/CIE-Lab.c
index 5c1e128a5022f48d2292a44573ecaf88f16a1ba9..83ae574f0ef89ebfa816a4c13ef0ef2616ba3511 100644 (file)
--- a/extensions/CIE-Lab.c
+++ b/extensions/CIE-Lab.c
@@ -21,6 +21,8 @@
 #include "babl.h"
 #include "util.h"
 
+int init (void);
+
 static void types         (void);
 static void components    (void);
 static void models        (void);
@@ -143,8 +145,8 @@ cpercep_distance_space (const double L1, const double a1, const double b1,
 
 
 static long
-rgba_to_lab (void *src,
-             void *dst,
+rgba_to_lab (char *src,
+             char *dst,
              long  n)
 {
   while (n--)
@@ -168,8 +170,8 @@ rgba_to_lab (void *src,
 }
 
 static long
-lab_to_rgba (void *src,
-             void *dst,
+lab_to_rgba (char *src,
+             char *dst,
              long  n)
 {
   while (n--)
@@ -195,8 +197,8 @@ lab_to_rgba (void *src,
 
 
 static long
-rgba_to_laba (void *src,
-              void *dst,
+rgba_to_laba (char *src,
+              char *dst,
               long  n)
 {
   while (n--)
@@ -222,8 +224,8 @@ rgba_to_laba (void *src,
 }
 
 static long
-laba_to_rgba (void *src,
-              void *dst,
+laba_to_rgba (char *src,
+              char *dst,
               long  n)
 {
   while (n--)
@@ -335,8 +337,8 @@ convert_double_u8_scaled (double        min_val,
                           double        max_val,
                           unsigned char min,
                           unsigned char max,
-                          void         *src,
-                          void         *dst,
+                          char         *src,
+                          char         *dst,
                           int           src_pitch,
                           int           dst_pitch,
                           long          n)
@@ -365,8 +367,8 @@ convert_u8_double_scaled (double        min_val,
                           double        max_val,
                           unsigned char min,
                           unsigned char max,
-                          void         *src,
-                          void         *dst,
+                          char         *src,
+                          char         *dst,
                           int           src_pitch,
                           int           dst_pitch,
                           long          n)
@@ -393,8 +395,8 @@ convert_u8_double_scaled (double        min_val,
 
 #define MAKE_CONVERSIONS(name, min_val, max_val, min, max)      \
 static long                                                     \
-convert_##name##_double (void *src,                             \
-                         void *dst,                             \
+convert_##name##_double (char *src,                             \
+                         char *dst,                             \
                          int   src_pitch,                       \
                          int   dst_pitch,                       \
                          long  n)                               \
@@ -403,8 +405,8 @@ convert_##name##_double (void *src,                             \
                             src, dst, src_pitch, dst_pitch, n); \
 }                                                               \
 static long                                                     \
-convert_double_##name (void *src,                               \
-                       void *dst,                               \
+convert_double_##name (char *src,                               \
+                       char *dst,                               \
                        int   src_pitch,                         \
                        int   dst_pitch,                         \
                        long  n)                                 \
@@ -475,8 +477,8 @@ convert_double_u16_scaled (double         min_val,
                            double         max_val,
                            unsigned short min,
                            unsigned short max,
-                           void          *src,
-                           void          *dst,
+                           char          *src,
+                           char          *dst,
                            int            src_pitch,
                            int            dst_pitch,
                            long           n)
@@ -505,8 +507,8 @@ convert_u16_double_scaled (double         min_val,
                            double         max_val,
                            unsigned short min,
                            unsigned short max,
-                           void          *src,
-                           void          *dst,
+                           char          *src,
+                           char          *dst,
                            int            src_pitch,
                            int            dst_pitch,
                            long           n)
@@ -532,8 +534,8 @@ convert_u16_double_scaled (double         min_val,
 
 #define MAKE_CONVERSIONS(name, min_val, max_val, min, max)      \
 static long                                                     \
-convert_##name##_double (void *src,                             \
-                         void *dst,                             \
+convert_##name##_double (char *src,                             \
+                         char *dst,                             \
                          int   src_pitch,                       \
                          int   dst_pitch,                       \
                          long  n)                               \
@@ -542,8 +544,8 @@ convert_##name##_double (void *src,                             \
                              src, dst, src_pitch, dst_pitch, n);\
 }                                                               \
 static long                                                     \
-convert_double_##name (void *src,                               \
-                       void *dst,                               \
+convert_double_##name (char *src,                               \
+                       char *dst,                               \
                        int   src_pitch,                         \
                        int   dst_pitch,                         \
                        long  n)                                 \

diff --git a/extensions/gegl-fixups.c b/extensions/gegl-fixups.c
index 556dbace135adc7dec0e24ee5f8f7e38e7e10b95..328f6e017f43a30dc0b4e0c12f63e4bd7cc21927 100644 (file)
--- a/extensions/gegl-fixups.c
+++ b/extensions/gegl-fixups.c
@@ -144,9 +144,9 @@ gggl_float_to_index16 (float f)
 static INLINE long
 conv_F_8 (unsigned char *src, unsigned char *dst, long samples)
 {
+  long n=samples;
   if (!table_inited)
     table_init ();
-  long n=samples;
   while (n--)
     {
       register float f = (*(float *) src);
@@ -160,9 +160,9 @@ conv_F_8 (unsigned char *src, unsigned char *dst, long samples)
 static INLINE long
 conv_8_F (unsigned char *src, unsigned char *dst, long samples)
 {
+  long n=samples;
   if (!table_inited)
     table_init ();
-  long n=samples;
   while (n--)
     {
       (*(float *) dst) = table_8_F[*(unsigned char *) src];
@@ -344,6 +344,8 @@ conv_rgbaF_sdl32 (unsigned char *srcc,
 
 #define conv_rgb8_rgbAF conv_rgb8_rgbaF
 
+int init (void);
+
 int
 init (void)
 {

diff --git a/extensions/gggl-lies.c b/extensions/gggl-lies.c
index 2fbc4a403507626e6e7c0d9c6c9eefc3e08f92a3..e5398e6ed71ad2ce4cf8cb2c8ed63fe32cbd6b9a 100644 (file)
--- a/extensions/gggl-lies.c
+++ b/extensions/gggl-lies.c
@@ -151,9 +151,9 @@ gggl_float_to_index16 (float f)
 static INLINE long
 conv_F_8 (unsigned char *src, unsigned char *dst, long samples)
 {
+  long n=samples;
   if (!table_inited)
     table_init ();
-  long n=samples;
   while (n--)
     {
       register float f = (*(float *) src);
@@ -167,9 +167,9 @@ conv_F_8 (unsigned char *src, unsigned char *dst, long samples)
 static INLINE long
 conv_F_16 (unsigned char *src, unsigned char *dst, long samples)
 {
+  long n=samples;
   if (!table_inited)
     table_init ();
-  long n=samples;
   while (n--)
     {
       register float f = (*(float *) src);
@@ -183,9 +183,9 @@ conv_F_16 (unsigned char *src, unsigned char *dst, long samples)
 static INLINE long
 conv_8_F (unsigned char *src, unsigned char *dst, long samples)
 {
+  long n=samples;
   if (!table_inited)
     table_init ();
-  long n=samples;
   while (n--)
     {
       (*(float *) dst) = table_8_F[*(unsigned char *) src];
@@ -198,9 +198,9 @@ conv_8_F (unsigned char *src, unsigned char *dst, long samples)
 static INLINE long
 conv_16_F (unsigned char *src, unsigned char *dst, long samples)
 {
+  long n=samples;
   if (!table_inited)
     table_init ();
-  long n=samples;
   while (n--)
     {
       (*(float *) dst) = table_16_F[*(unsigned short *) src];
@@ -1730,7 +1730,7 @@ typedef struct Conversion
 } Conversion;
 
 
-
+int init (void);
 
 int
 init (void)

diff --git a/extensions/gggl.c b/extensions/gggl.c
index 02ae855f8eff7dcea523486efaafb856ac7c4e06..aba024e0911416f3c00ec3099185b442fdbc1498 100644 (file)
--- a/extensions/gggl.c
+++ b/extensions/gggl.c
@@ -150,9 +150,9 @@ gggl_float_to_index16 (float f)
 static INLINE long
 conv_F_8 (unsigned char *src, unsigned char *dst, long samples)
 {
+  long n=samples;
   if (!table_inited)
     table_init ();
-  long n=samples;
   while (n--)
     {
       register float f = (*(float *) src);
@@ -166,9 +166,9 @@ conv_F_8 (unsigned char *src, unsigned char *dst, long samples)
 static INLINE long
 conv_F_16 (unsigned char *src, unsigned char *dst, long samples)
 {
+  long n=samples;
   if (!table_inited)
     table_init ();
-  long n=samples;
   while (n--)
     {
       register float f = (*(float *) src);
@@ -182,9 +182,9 @@ conv_F_16 (unsigned char *src, unsigned char *dst, long samples)
 static INLINE long
 conv_8_F (unsigned char *src, unsigned char *dst, long samples)
 {
+  long n=samples;
   if (!table_inited)
     table_init ();
-  long n=samples;
   while (n--)
     {
       (*(float *) dst) = table_8_F[*(unsigned char *) src];
@@ -197,9 +197,9 @@ conv_8_F (unsigned char *src, unsigned char *dst, long samples)
 static INLINE long
 conv_16_F (unsigned char *src, unsigned char *dst, long samples)
 {
+  long n=samples;
   if (!table_inited)
     table_init ();
-  long n=samples;
   while (n--)
     {
       (*(float *) dst) = table_16_F[*(unsigned short *) src];
@@ -1825,6 +1825,8 @@ typedef struct Conversion
   void      (*function) (unsigned char *src, unsigned char *dst, long samples);
 } Conversion;
 
+int init (void);
+
 int
 init (void)
 {

diff --git a/extensions/naive-CMYK.c b/extensions/naive-CMYK.c
index 0b5478bfcec548d89400443014251e9dfcbaf92d..ea486d7f0fcbcab7a34730a0db74d7696b8786c6 100644 (file)
--- a/extensions/naive-CMYK.c
+++ b/extensions/naive-CMYK.c
@@ -24,15 +24,17 @@
 #include "util.h"
 
 static long
-rgba_to_cmyk (void *src,
-              void *dst,
+rgba_to_cmyk (char *src,
+              char *dst,
               long   n);
 
 static long 
-cmyk_to_rgba (void *src,
-              void *dst,
+cmyk_to_rgba (char *src,
+              char *dst,
               long  n);
 
+int init (void);
+
 int
 init (void)
 {
@@ -80,8 +82,8 @@ init (void)
 
 
 static long
-rgba_to_cmyk (void *src,
-              void *dst,
+rgba_to_cmyk (char *src,
+              char *dst,
               long   n)
 {
   while (n--)
@@ -130,8 +132,8 @@ rgba_to_cmyk (void *src,
 }
 
 static long 
-cmyk_to_rgba (void *src,
-              void *dst,
+cmyk_to_rgba (char *src,
+              char *dst,
               long  n)
 {
   while (n--)

diff --git a/tests/babl-html-dump.c b/tests/babl-html-dump.c
index 55c95cddbd0ff1dbf20e65d4e7badedbeec3c8d0..eda0b2cfd1a6c40a51c3baebb14581056758b0bc 100644 (file)
--- a/tests/babl-html-dump.c
+++ b/tests/babl-html-dump.c
@@ -87,7 +87,7 @@ main (void)
 
 static char normalized_buf[512];
 
-const char *normalize(const char *str)
+static const char *normalize(const char *str)
 {
   char *s = normalized_buf;
   strcpy (normalized_buf, str);

diff --git a/tests/babl_class_name.c b/tests/babl_class_name.c
index 0aad17bacc112a2dca6c8b688d4ef0ff056b6a89..5dca8c7cc968b21986a4f314427802477f18f1d8 100644 (file)
--- a/tests/babl_class_name.c
+++ b/tests/babl_class_name.c
@@ -44,7 +44,7 @@ struct
     {0, NULL}
   };
 
-int
+static int
 test (void)
 {
   int i=0;

diff --git a/tests/formats.c b/tests/formats.c
index abe0f89fefb2f61c21dcdf1524fc2a119033bae3..89158288459792a6bac2db77dc8a02698aac381b 100644 (file)
--- a/tests/formats.c
+++ b/tests/formats.c
@@ -6,7 +6,7 @@
 #include "babl-internal.h"
 
 
-int format_check (Babl *babl,
+static int format_check (Babl *babl,
                   void *userdata)
 {
   babl_log ("%s\tloss: %f", babl->instance.name, babl->format.loss);

diff --git a/tests/grayscale_to_rgb.c b/tests/grayscale_to_rgb.c
index b3d06f22a270720cb52f7ff7dd3a69bed0c69c2c..71120b8c19f8a1462d6f6c8abe5aa25459e66191 100644 (file)
--- a/tests/grayscale_to_rgb.c
+++ b/tests/grayscale_to_rgb.c
@@ -28,7 +28,7 @@ float rgb_buf_ref [PIXELS*3]=
 
 float rgb_buf     [PIXELS*3];
 
-int
+static int
 test (void)
 {
   Babl *fish;

diff --git a/tests/models.c b/tests/models.c
index 040664d1e9ae57d2b27eae433998b1f0b04ce43b..23c37517bc7274938eaa773450a2b74048dacdd9 100644 (file)
--- a/tests/models.c
+++ b/tests/models.c
@@ -8,8 +8,8 @@
 int OK=1;
 
 
-int model_check (Babl *babl,
-                 void *userdata)
+static int model_check (Babl *babl,
+                        void *userdata)
 {
   if (!babl_model_is_symmetric (babl))
     {

diff --git a/tests/rgb_to_bgr.c b/tests/rgb_to_bgr.c
index e424642c2acd7612503d44ad2c45bc8d71831362..eb9460c748fcffe2010810c149affcd225bc41cf 100644 (file)
--- a/tests/rgb_to_bgr.c
+++ b/tests/rgb_to_bgr.c
@@ -36,7 +36,7 @@ unsigned char reference_buf [PIXELS*3]=
 
 unsigned char destination_buf [PIXELS*3];
 
-int
+static int
 test (void)
 {
   Babl *fish;

diff --git a/tests/rgb_to_ycbcr.c b/tests/rgb_to_ycbcr.c
index a2f8d36086cb5d51400ea9dd4630fec421c92bfc..8e07a8ab46e99ac141bb5e835ff9b6578d31636a 100644 (file)
--- a/tests/rgb_to_ycbcr.c
+++ b/tests/rgb_to_ycbcr.c
@@ -43,7 +43,7 @@ float reference_buf [PIXELS*3]=
 
 float destination_buf [PIXELS*3];
 
-int
+static int
 test (void)
 {
   Babl *fish;

diff --git a/tests/srgb_to_lab_u8.c b/tests/srgb_to_lab_u8.c
index 6ddd2cd31c7a8ab212893502f3a05899b676bb38..de6da2aa9f00a22e7479d01497ed8dc94a75bd81 100644 (file)
--- a/tests/srgb_to_lab_u8.c
+++ b/tests/srgb_to_lab_u8.c
@@ -41,7 +41,7 @@ unsigned char reference_buf [PIXELS*3]=
 
 unsigned char destination_buf [PIXELS*3];
 
-int
+static int
 test (void)
 {
   int   i;

diff --git a/tests/types.c b/tests/types.c
index a0748b6e013344972bfd7c7d61bca0827ba6a84f..fe99fea2240beebf5af7cf5327d843e2989a69e9 100644 (file)
--- a/tests/types.c
+++ b/tests/types.c
@@ -3,8 +3,8 @@
 
 int OK=1;
 
-int type_check (Babl *babl,
-                void *userdata)
+static int type_check (Babl *babl,
+                       void *userdata)
 {
   if (!babl_type_is_symmetric (babl))
     {